Fix M-x in Viper mode.

* lisp/emulation/viper-cmd.el (viper-intercept-ESC-key): Fix
key-binding lookup for ESC key.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5cff3a505b27337c7fd63932dad294cb7a6910c4..964e446378eaaf7d70fc0f726c93dc1305894eb7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-02-27  Chong Yidong  <cyd@gnu.org>
 
+       * emulation/viper-cmd.el (viper-intercept-ESC-key): Fix
+       key-binding lookup for ESC key (Bug#9146).
+
        * font-lock.el (font-lock-specified-p): Rename from
        font-lock-spec-present.  Callers changed.
 

diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 503fd2c66d5397dff6a0bf368f695aafacdd336b..68f40349454e4d0ba71090ce6b61d5ae1f9db9e6 100644 (file)
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -1086,8 +1086,17 @@ as a Meta key and any number of multiple escapes are allowed."
 (defun viper-intercept-ESC-key ()
   "Function that implements ESC key in Viper emulation of Vi."
   (interactive)
-  (let ((cmd (or (key-binding (viper-envelop-ESC-key))
-                (lambda () (interactive) (error "Viper bell")))))
+  ;; `key-binding' needs to be called in a context where Viper's
+  ;; minor-mode map(s) have been temporarily disabled so the ESC
+  ;; binding to viper-intercept-ESC-key doesn't hide the binding we're
+  ;; looking for (Bug#9146):
+  (let* ((event (viper-envelop-ESC-key))
+        (cmd (cond ((equal event viper-ESC-key)
+                    'viper-intercept-ESC-key)
+                   ((let ((emulation-mode-map-alists nil))
+                      (key-binding event)))
+                   (t
+                    (error "Viper bell")))))
 
     ;; call the actual function to execute ESC (if no other symbols followed)
     ;; or the key bound to the ESC sequence (if the sequence was issued